From: Peter Michael Green Date: Tue, 4 Apr 2023 01:55:06 +0000 (+0000) Subject: Manual merge of version 1:102.9.0-1~deb11u1+rpi1 and 1:102.9.0-1~deb10u1 to produce... X-Git-Tag: archive/raspbian/1%102.9.0-1_deb10u1+rpi1~3 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22Program/%22http:/www.example.com/cgi/%22https:/%22Program?a=commitdiff_plain;h=65d6b19d5f25336ba87e7ee3e43e8e9d96f4f746;p=thunderbird.git Manual merge of version 1:102.9.0-1~deb11u1+rpi1 and 1:102.9.0-1~deb10u1 to produce 1:102.9.0-1~deb10u1+rpi1 --- 65d6b19d5f25336ba87e7ee3e43e8e9d96f4f746 diff --cc debian/changelog index 03f4905cbc,8d88819f60..6a92b16341 --- a/debian/changelog +++ b/debian/changelog @@@ -1,51 -1,8 +1,57 @@@ - thunderbird (1:102.9.0-1~deb11u1+rpi1) bullseye-staging; urgency=medium ++thunderbird (1:102.9.0-1~deb10u1+rpi1) buster-staging; urgency=medium + + [changes brought over from firefox-esr 60.3.0esr-1+rpi1 by Peter Michael Green at Wed, 05 Dec 2018 06:56:52 +0000] + * Hack broken rust target selection so it produces the right target + on raspbian. + * Fix clean target. + + [changes introduced in 60.4.0-1+rpi1 by Peter Michael Green] + * Further fixes to clean target (still not completely fixed :( ). + + [changes introduced in 1:68.5.0-1~deb10u1+rpi1 by Peter Michael Green] + * Disable neon (patches taken from firefox-esr package) + * Build in a chroot with arm64 binutils-arm-linux-gnueabihf + + [changes brought forward from 1:68.5.0-1~deb10u1+rpi2 by Peter Michael Green at Sun, 15 Mar 2020 16:27:21 +0000] + * Actually build the binary packages on armhf. + * Yet more clean target fixing. + + [changes brought over from firefox-esr 78.3.0esr-2+rpi1 by Peter Michael Green] + * Clean up pycache directories. + * Disable neon in qcms. + + [changes introduced in 1:78.4.0-1~deb10u1+rpi1 by Peter Michael Green] + * Add export NSS_DISABLE_ARM32_NEON=1 to hopefully disable neon in nss. + * Adding the define in debian/rules didn't seem to work, try to patch out neon in nss instead + + [changes brought forward from 1:78.5.1-1+rpi2 by Peter Michael Green at Tue, 15 Dec 2020 00:33:33 +0000] + * Actually build thunderbird binary on armhf + (changelog says this was already done, but it got lost somewhere + along the way). + + [changes introduced in 1:91.3.2-1+rpi1 by Peter Michael Green] + * Use a #define instead of a typedef for double_t in fdlibm to prevent conflicting + definitions error. + + [changes introduced in 1:91.5.1-1+rpi1 by Peter Micheal Green] + * Further hacks to rust target selection. + + [changes introduced in 1:102.1.1-1+rpi1 by Peter Michael Green] + * Don't build rust code with Clto to avoid out of memory errors. + * Disable more armv7/neon stuff. + + [changes brought over from firefox-esr 102.2.0esr-1+rpi1 by Peter Michael Green] + * Disable jit (or at least try to) + + Pass disable-jit from debian/rules + + Nerf jit detection in s/moz.configure + - -- Raspbian forward porter Thu, 30 Mar 2023 12:39:04 +0000 ++ -- Peter Michael Green Tue, 04 Apr 2023 01:50:41 +0000 ++ + thunderbird (1:102.9.0-1~deb10u1) buster-security; urgency=medium + + * Rebuild for buster-security + + -- Carsten Schoenert Sat, 18 Mar 2023 08:34:01 +0100 thunderbird (1:102.9.0-1~deb11u1) bullseye-security; urgency=medium diff --cc debian/patches/series index 39c7925e17,3f8ca3efe6..420b13c4cb --- a/debian/patches/series +++ b/debian/patches/series @@@ -25,13 -25,5 +25,14 @@@ porting-ppc64el/work-around-a-build-fai debian-hacks/Make-Thunderbird-build-reproducible.patch debian-hacks/Decrease-Cargo-minimal-version-to-1.46.0.patch debian-hacks/Fix-Floating-Point-Normalization-breakage-on-32bit-Linux.patch + debian-hacks/Allow-to-override-rust-LTO-flag.patch + debian-hacks/PATCH-Allow-to-build-with-older-versions-of-nodejs-10.patch +raspbian-rust-triplet-hack.patch +try-to-disable-neon.patch +try-harder-to-disable-neon.patch +disable-neon-in-qcms.patch +patch-out-neon-in-freebl.patch +use-a-define-instead-of-a-typedef-for-do.patch +further-raspbian-hacks-to-rust-target-se.patch - dont-build-rust-code-with-clto-to-avoid-.patch +disable-more-armv7neon-stuff.patch +disable-jit.patch diff --cc debian/rules index b6b54995a0,a307586904..34063b6ac7 --- a/debian/rules +++ b/debian/rules @@@ -43,6 -43,11 +43,11 @@@ ifeq ($(DEB_BUILD_ARCH),armel LDFLAGS += -Wl,-z,muldefs endif + # Use thinLTO on armhf, to stay in the memory budget with an armhf toolchain. + ifeq (armhf,$(DEB_BUILD_ARCH)) -export DEBIAN_RUST_LTO=-Clto=thin ++export DEBIAN_RUST_LTO=-Clto=off + endif + # Reduce memory usage of the linker at the expense of processing time # This should help on lower-end architectures like arm and mips, which # spend an immense amount of time swapping.